From 0b5db507da8fff0c9d4fad16c4b4fc569ffb3ec0 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Sat, 11 Aug 2001 20:27:36 +0000 Subject: [PATCH] coalescing property notifies 2001-08-11 Hans Breuer * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all GDK_TYPE_EVENT signals * gtk/gtkalignment.c : removed 'direct allocation bug', which Tim discovered while reading the patch --- ChangeLog | 16 ++++++++++ ChangeLog.pre-2-0 | 16 ++++++++++ ChangeLog.pre-2-10 | 16 ++++++++++ ChangeLog.pre-2-2 | 16 ++++++++++ ChangeLog.pre-2-4 | 16 ++++++++++ ChangeLog.pre-2-6 | 16 ++++++++++ ChangeLog.pre-2-8 | 16 ++++++++++ gdk/win32/gdkgc-win32.c | 11 +++---- gdk/win32/gdkimage-win32.c | 6 ++-- gdk/win32/gdkwindow-win32.c | 17 +++++++++-- gtk/gtkalignment.c | 58 ++++++++++++++++++------------------- gtk/gtkarrow.c | 31 ++++++++++---------- gtk/gtkaspectframe.c | 56 ++++++++++++++++++----------------- gtk/gtkcellrenderer.c | 23 ++++++++++----- gtk/gtkcellrenderertext.c | 2 ++ gtk/gtkclist.c | 2 +- gtk/gtkcombo.c | 2 ++ gtk/gtkcurve.c | 2 ++ gtk/gtkfontsel.c | 2 ++ gtk/gtklayout.c | 2 ++ gtk/gtkmisc.c | 4 +++ gtk/gtkpacker.c | 4 +++ gtk/gtkprogress.c | 2 ++ gtk/gtkruler.c | 2 ++ gtk/gtksettings.c | 2 ++ gtk/gtkspinbutton.c | 2 ++ gtk/gtktexttag.c | 4 ++- gtk/gtktipsquery.c | 2 +- gtk/gtkwidget.c | 56 +++++++++++++++++------------------ 29 files changed, 284 insertions(+), 120 deletions(-) diff --git a/ChangeLog b/ChangeLog index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 57d2913d40..3abcfac36a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,19 @@ +2001-08-11 Hans Breuer + + * gtk/gtkalignment.c, gtk/gtkarrow.c, gtk/gtkaspectframe.c, + gtk/gtkcellrenderer.c, gtk/gtkcellrenderertext.c, + gtk/gtkcombo.c, gtk/gtkcurve.c, gtk/gtkfontsel.c, + gtk/gtklayout.c, gtk/gtkmisc.c, gtk/gtkpacker.c, + gtk/gtkprogress.c, gtk/gtkruler.c,, gtk/gtksettings.c, + gtk/gtkspinbutton.c, gtk/gtktexttag.c : coalescing property notifies + + * gtk/gtkclist.c, gtk/gtktipsquery.c, gtk/gtktexttag.c, + gtk/gtkwidget.c : added G_SIGNAL_TYPE_STATIC_SCOPE to all + GDK_TYPE_EVENT signals + + * gtk/gtkalignment.c : removed 'direct allocation bug', + which Tim discovered while reading the patch + Sat Aug 11 14:32:14 2001 Owen Taylor * gtk/gtkwidget.h (gtk_widget_set_default_visual): Add some diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c index e08673da8d..312809a556 100644 --- a/gdk/win32/gdkgc-win32.c +++ b/gdk/win32/gdkgc-win32.c @@ -991,9 +991,9 @@ gdk_win32_hdc_get (GdkDrawable *drawable, if (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable)) impl = GDK_DRAWABLE_IMPL_WIN32(drawable); else if (GDK_IS_WINDOW (drawable)) - impl = ((GdkWindowObject *) drawable)->impl; + impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_WINDOW_OBJECT (drawable))->impl); else if (GDK_IS_PIXMAP (drawable)) - impl = ((GdkPixmapObject *) drawable)->impl; + impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_PIXMAP_OBJECT (drawable))->impl); win32_gc->hwnd = impl->handle; @@ -1209,9 +1209,9 @@ gdk_win32_hdc_release (GdkDrawable *drawable, if (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable)) impl = GDK_DRAWABLE_IMPL_WIN32(drawable); else if (GDK_IS_WINDOW (drawable)) - impl = ((GdkWindowObject *) drawable)->impl; + impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_WINDOW_OBJECT (drawable))->impl); else if (GDK_IS_PIXMAP (drawable)) - impl = ((GdkPixmapObject *) drawable)->impl; + impl = GDK_DRAWABLE_IMPL_WIN32 ((GDK_PIXMAP_OBJECT (drawable))->impl); if (usage & GDK_GC_FOREGROUND) { @@ -1241,7 +1241,8 @@ gdk_win32_hdc_release (GdkDrawable *drawable, } else { - ReleaseDC (win32_gc->hwnd, win32_gc->hdc); + if (!ReleaseDC (win32_gc->hwnd, win32_gc->hdc)) + WIN32_GDI_FAILED ("ReleaseDC"); } if (hpen != NULL) diff --git a/gdk/win32/gdkimage-win32.c b/gdk/win32/gdkimage-win32.c index 86f90ebf78..b204f850d0 100644 --- a/gdk/win32/gdkimage-win32.c +++ b/gdk/win32/gdkimage-win32.c @@ -423,11 +423,13 @@ _gdk_win32_get_image (GdkDrawable *drawable, if (GDK_IS_PIXMAP (drawable)) { SelectObject (hdc, oldbitmap1); - DeleteDC (hdc); + if (!DeleteDC (hdc)) + WIN32_GDI_FAILED ("DeleteDC"); } else { - ReleaseDC (impl->handle, hdc); + if (!ReleaseDC (impl->handle, hdc)) + WIN32_GDI_FAILED ("ReleaseDC"); } g_free (image); return NULL; diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 3e2874e4c8..1d6e7deeb4 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -530,8 +530,9 @@ gdk_window_new (GdkWindow *parent, dwExStyle = WS_EX_TRANSPARENT; private->depth = 0; private->input_only = TRUE; - draw_impl->colormap = NULL; - GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, NULL colormap\n")); + draw_impl->colormap = gdk_colormap_get_system (); + gdk_colormap_ref (draw_impl->colormap); + GDK_NOTE (MISC, g_print ("...GDK_INPUT_ONLY, system colormap\n")); } if (parent_private) @@ -1505,8 +1506,10 @@ gdk_window_set_transient_for (GdkWindow *window, if (!SetWindowLong (window_id, GWL_STYLE, style)) WIN32_API_FAILED ("SetWindowLong"); +#if 0 /* not sure if we want to do this, clipping to parent size! */ if (!SetParent (window_id, parent_id)) WIN32_API_FAILED ("SetParent"); +#endif if (!RedrawWindow (window_id, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW)) @@ -1751,6 +1754,11 @@ gdk_window_get_frame_extents (GdkWindow *window, HWND hwnd; RECT r; + g_return_if_fail (GDK_IS_WINDOW (window)); + g_return_if_fail (rect != NULL); + + private = GDK_WINDOW_OBJECT (window); + rect->x = 0; rect->y = 0; rect->width = 1; @@ -1759,6 +1767,9 @@ gdk_window_get_frame_extents (GdkWindow *window, if (GDK_WINDOW_DESTROYED (window)) return; + while (private->parent && ((GdkWindowObject*) private->parent)->parent) + private = (GdkWindowObject*) private->parent; + hwnd = GDK_WINDOW_HWND (window); /* find the frame window */ while (HWND_DESKTOP != GetParent (hwnd)) @@ -1767,7 +1778,7 @@ gdk_window_get_frame_extents (GdkWindow *window, g_return_if_fail (NULL != hwnd); } - if (GetWindowRect (hwnd, &r)) + if (!GetWindowRect (hwnd, &r)) WIN32_API_FAILED ("GetWindowRect"); rect->x = r.left; diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c index 282f712024..df78a4310e 100644 --- a/gtk/gtkalignment.c +++ b/gtk/gtkalignment.c @@ -247,8 +247,6 @@ gtk_alignment_set (GtkAlignment *alignment, gfloat xscale, gfloat yscale) { - gboolean values_changed = FALSE; - g_return_if_fail (GTK_IS_ALIGNMENT (alignment)); xalign = CLAMP (xalign, 0.0, 1.0); @@ -256,34 +254,36 @@ gtk_alignment_set (GtkAlignment *alignment, xscale = CLAMP (xscale, 0.0, 1.0); yscale = CLAMP (yscale, 0.0, 1.0); - if (alignment->xalign != xalign) - { - values_changed = TRUE; - alignment->xalign = xalign; - g_object_notify (G_OBJECT(alignment), "xalign"); - } - if (alignment->yalign != yalign) - { - values_changed = TRUE; - alignment->yalign = yalign; - g_object_notify (G_OBJECT(alignment), "yalign"); - } - if (alignment->xscale != xscale) - { - values_changed = TRUE; - alignment->xscale = xscale; - g_object_notify (G_OBJECT(alignment), "xscale"); - } - if (alignment->yscale != yscale) - { - values_changed = TRUE; - alignment->yscale = yscale; - g_object_notify (G_OBJECT(alignment), "yscale"); - } - - if (values_changed == TRUE) + if ( (alignment->xalign != xalign) + || (alignment->yalign != yalign) + || (alignment->xscale != xscale) + || (alignment->yscale != yscale)) { - gtk_widget_size_allocate (GTK_WIDGET (alignment), &(GTK_WIDGET (alignment)->allocation)); + g_object_freeze_notify (G_OBJECT (alignment)); + if (alignment->xalign != xalign) + { + alignment->xalign = xalign; + g_object_notify (G_OBJECT(alignment), "xalign"); + } + if (alignment->yalign != yalign) + { + alignment->yalign = yalign; + g_object_notify (G_OBJECT(alignment), "yalign"); + } + if (alignment->xscale != xscale) + { + alignment->xscale = xscale; + g_object_notify (G_OBJECT(alignment), "xscale"); + } + if (alignment->yscale != yscale) + { + alignment->yscale = yscale; + g_object_notify (G_OBJECT(alignment), "yscale"); + } + g_object_thaw_notify (G_OBJECT (alignment)); + + if (GTK_BIN (alignment)->child) + gtk_widget_queue_resize (GTK_BIN (alignment)->child); gtk_widget_queue_draw (GTK_WIDGET (alignment)); } } diff --git a/gtk/gtkarrow.c b/gtk/gtkarrow.c index 1e9b14d88d..d26e2651b0 100644 --- a/gtk/gtkarrow.c +++ b/gtk/gtkarrow.c @@ -194,26 +194,27 @@ gtk_arrow_set (GtkArrow *arrow, GtkArrowType arrow_type, GtkShadowType shadow_type) { - gboolean changed = FALSE; - g_return_if_fail (GTK_IS_ARROW (arrow)); - if ((GtkArrowType) arrow->arrow_type != arrow_type) + if ( ((GtkArrowType) arrow->arrow_type != arrow_type) + || ((GtkShadowType) arrow->shadow_type != shadow_type)) { - arrow->arrow_type = arrow_type; - g_object_notify (G_OBJECT (arrow), "arrow_type"); - changed = TRUE; - } + g_object_freeze_notify (G_OBJECT (arrow)); - if ((GtkShadowType) arrow->shadow_type != shadow_type) - { - arrow->shadow_type = shadow_type; - g_object_notify (G_OBJECT (arrow), "shadow_type"); - changed = TRUE; - } + if ((GtkArrowType) arrow->arrow_type != arrow_type) + { + arrow->arrow_type = arrow_type; + g_object_notify (G_OBJECT (arrow), "arrow_type"); + } + + if ((GtkShadowType) arrow->shadow_type != shadow_type) + { + arrow->shadow_type = shadow_type; + g_object_notify (G_OBJECT (arrow), "shadow_type"); + } + + g_object_thaw_notify (G_OBJECT (arrow)); - if (changed == TRUE) - { if (GTK_WIDGET_DRAWABLE (arrow)) gtk_widget_queue_clear (GTK_WIDGET (arrow)); } diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index 1dec4a392b..d2e5486065 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -241,8 +241,6 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame, gfloat ratio, gboolean obey_child) { - gboolean needs_resize = FALSE; - g_return_if_fail (GTK_IS_ASPECT_FRAME (aspect_frame)); xalign = CLAMP (xalign, 0.0, 1.0); @@ -250,33 +248,37 @@ gtk_aspect_frame_set (GtkAspectFrame *aspect_frame, ratio = CLAMP (ratio, MIN_RATIO, MAX_RATIO); obey_child = obey_child != FALSE; - if (aspect_frame->xalign != xalign) + if ( (aspect_frame->xalign != xalign) + || (aspect_frame->yalign != yalign) + || (aspect_frame->ratio != ratio) + || (aspect_frame->obey_child != obey_child)) { - aspect_frame->xalign = xalign; - g_object_notify (G_OBJECT (aspect_frame), "xalign"); - needs_resize = TRUE; - } - if (aspect_frame->yalign != yalign) - { - aspect_frame->yalign = yalign; - g_object_notify (G_OBJECT (aspect_frame), "yalign"); - needs_resize = TRUE; - } - if (aspect_frame->ratio != ratio) - { - aspect_frame->ratio = ratio; - g_object_notify (G_OBJECT (aspect_frame), "ratio"); - needs_resize = TRUE; - } - if (aspect_frame->obey_child != obey_child) - { - aspect_frame->obey_child = obey_child; - g_object_notify (G_OBJECT (aspect_frame), "obey_child"); - needs_resize = TRUE; - } - - if (needs_resize == TRUE) + g_object_freeze_notify (G_OBJECT (aspect_frame)); + + if (aspect_frame->xalign != xalign) + { + aspect_frame->xalign = xalign; + g_object_notify (G_OBJECT (aspect_frame), "xalign"); + } + if (aspect_frame->yalign != yalign) + { + aspect_frame->yalign = yalign; + g_object_notify (G_OBJECT (aspect_frame), "yalign"); + } + if (aspect_frame->ratio != ratio) + { + aspect_frame->ratio = ratio; + g_object_notify (G_OBJECT (aspect_frame), "ratio"); + } + if (aspect_frame->obey_child != obey_child) + { + aspect_frame->obey_child = obey_child; + g_object_notify (G_OBJECT (aspect_frame), "obey_child"); + } + g_object_thaw_notify (G_OBJECT (aspect_frame)); + gtk_widget_queue_resize (GTK_WIDGET(aspect_frame)); + } } static void diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c index 610d807bdb..75cc0c8bb8 100644 --- a/gtk/gtkcellrenderer.c +++ b/gtk/gtkcellrenderer.c @@ -428,16 +428,23 @@ gtk_cell_renderer_set_fixed_size (GtkCellRenderer *cell, g_return_if_fail (GTK_IS_CELL_RENDERER (cell)); g_return_if_fail (width >= -1 && height >= -1); - if (width != cell->width) + if ((width != cell->width) || (height != cell->height)) { - cell->width = width; - g_object_notify (G_OBJECT (cell), "width"); - } + g_object_freeze_notify (G_OBJECT (cell)); - if (height != cell->height) - { - cell->height = height; - g_object_notify (G_OBJECT (cell), "height"); + if (width != cell->width) + { + cell->width = width; + g_object_notify (G_OBJECT (cell), "width"); + } + + if (height != cell->height) + { + cell->height = height; + g_object_notify (G_OBJECT (cell), "height"); + } + + g_object_thaw_notify (G_OBJECT (cell)); } } diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 71fea117ab..2e20f3e16b 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -657,6 +657,7 @@ set_font_description (GtkCellRendererText *celltext, } else { + g_object_freeze_notify (G_OBJECT (celltext)); if (celltext->family_set) { celltext->family_set = FALSE; @@ -687,6 +688,7 @@ set_font_description (GtkCellRendererText *celltext, celltext->size_set = FALSE; g_object_notify (G_OBJECT (celltext), "size_set"); } + g_object_thaw_notify (G_OBJECT (celltext)); } } diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 7fa6de02bb..822430d67d 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -618,7 +618,7 @@ gtk_clist_class_init (GtkCListClass *klass) GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); clist_signals[UNSELECT_ROW] = gtk_signal_new ("unselect_row", GTK_RUN_FIRST, diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 82d3cacf99..01ecbc5ba1 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -903,8 +903,10 @@ gtk_combo_set_use_arrows_always (GtkCombo * combo, gboolean val) combo->use_arrows_always = val; combo->use_arrows = TRUE; + g_object_freeze_notify (G_OBJECT (combo)); g_object_notify (G_OBJECT (combo), "enable_arrow_keys"); g_object_notify (G_OBJECT (combo), "enable_arrows_always"); + g_object_thaw_notify (G_OBJECT (combo)); } void diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c index 05d96cdbfb..38c74a07fd 100644 --- a/gtk/gtkcurve.c +++ b/gtk/gtkcurve.c @@ -824,6 +824,7 @@ gtk_curve_set_range (GtkCurve *curve, gfloat min_y, gfloat max_y) { + g_object_freeze_notify (G_OBJECT (curve)); if (curve->min_x != min_x) { curve->min_x = min_x; g_object_notify (G_OBJECT (curve), "min_x"); @@ -840,6 +841,7 @@ gtk_curve_set_range (GtkCurve *curve, curve->max_y = max_y; g_object_notify (G_OBJECT (curve), "max_y"); } + g_object_thaw_notify (G_OBJECT (curve)); gtk_curve_size_graph (curve); gtk_curve_reset_vector (curve); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 63f643f76c..06d084951c 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -890,8 +890,10 @@ gtk_font_selection_set_font_name (GtkFontSelection *fontsel, pango_font_description_free (fontsel->font_desc); fontsel->font_desc = new_desc; + g_object_freeze_notify (G_OBJECT (fontsel)); g_object_notify (G_OBJECT (fontsel), "font_name"); g_object_notify (G_OBJECT (fontsel), "font"); + g_object_thaw_notify (G_OBJECT (fontsel)); return TRUE; } diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c index 07c0a89b56..607137f882 100644 --- a/gtk/gtklayout.c +++ b/gtk/gtklayout.c @@ -356,6 +356,7 @@ gtk_layout_set_size (GtkLayout *layout, widget = GTK_WIDGET (layout); + g_object_freeze_notify (G_OBJECT (layout)); if (width != layout->width) { layout->width = width; @@ -366,6 +367,7 @@ gtk_layout_set_size (GtkLayout *layout, layout->height = height; g_object_notify (G_OBJECT (layout), "height"); } + g_object_thaw_notify (G_OBJECT (layout)); gtk_layout_set_adjustment_upper (layout->hadjustment, layout->width); gtk_layout_set_adjustment_upper (layout->vadjustment, layout->height); diff --git a/gtk/gtkmisc.c b/gtk/gtkmisc.c index 272c5467dd..210881a895 100644 --- a/gtk/gtkmisc.c +++ b/gtk/gtkmisc.c @@ -233,11 +233,13 @@ gtk_misc_set_alignment (GtkMisc *misc, gtk_widget_queue_clear (widget); } + g_object_freeze_notify (G_OBJECT (misc)); if (xalign != misc->xalign) g_object_notify (G_OBJECT (misc), "xalign"); if (yalign != misc->yalign) g_object_notify (G_OBJECT (misc), "yalign"); + g_object_thaw_notify (G_OBJECT (misc)); } } @@ -292,11 +294,13 @@ gtk_misc_set_padding (GtkMisc *misc, if (GTK_WIDGET_DRAWABLE (misc)) gtk_widget_queue_resize (GTK_WIDGET (misc)); + g_object_freeze_notify (G_OBJECT (misc)); if (xpad != misc->xpad) g_object_notify (G_OBJECT (misc), "xpad"); if (ypad != misc->ypad) g_object_notify (G_OBJECT (misc), "ypad"); + g_object_thaw_notify (G_OBJECT (misc)); } } diff --git a/gtk/gtkpacker.c b/gtk/gtkpacker.c index 9a5a54afe3..17dc385f7e 100644 --- a/gtk/gtkpacker.c +++ b/gtk/gtkpacker.c @@ -627,10 +627,12 @@ gtk_packer_set_default_pad (GtkPacker *packer, packer->default_pad_y = pad_y; redo_defaults_children (packer); + g_object_freeze_notify (G_OBJECT (packer)); if (packer->default_pad_x != pad_x) g_object_notify (G_OBJECT (packer), "default_pad_x"); if (packer->default_pad_y != pad_y) g_object_notify (G_OBJECT (packer), "default_pad_y"); + g_object_thaw_notify (G_OBJECT (packer)); } } @@ -648,10 +650,12 @@ gtk_packer_set_default_ipad (GtkPacker *packer, packer->default_i_pad_y = i_pad_y; redo_defaults_children (packer); + g_object_freeze_notify (G_OBJECT (packer)); if (packer->default_i_pad_x != i_pad_x) g_object_notify (G_OBJECT (packer), "default_ipad_x"); if (packer->default_i_pad_y != i_pad_y) g_object_notify (G_OBJECT (packer), "default_ipad_y"); + g_object_thaw_notify (G_OBJECT (packer)); } } diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index 44af6a5b96..74b5485a4c 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -633,6 +633,7 @@ gtk_progress_set_text_alignment (GtkProgress *progress, if (progress->x_align != x_align || progress->y_align != y_align) { + g_object_freeze_notify (G_OBJECT (progress)); if (progress->x_align != x_align) { progress->x_align = x_align; @@ -644,6 +645,7 @@ gtk_progress_set_text_alignment (GtkProgress *progress, progress->y_align = y_align; g_object_notify (G_OBJECT (progress), "text_yalign"); } + g_object_thaw_notify (G_OBJECT (progress)); if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (progress))) gtk_widget_queue_resize (GTK_WIDGET (progress)); diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c index 754155a028..97f358f91e 100644 --- a/gtk/gtkruler.c +++ b/gtk/gtkruler.c @@ -271,6 +271,7 @@ gtk_ruler_set_range (GtkRuler *ruler, { g_return_if_fail (GTK_IS_RULER (ruler)); + g_object_freeze_notify (G_OBJECT (ruler)); if (ruler->lower != lower) { ruler->lower = lower; @@ -291,6 +292,7 @@ gtk_ruler_set_range (GtkRuler *ruler, ruler->max_size = max_size; g_object_notify (G_OBJECT (ruler), "max_size"); } + g_object_thaw_notify (G_OBJECT (ruler)); if (GTK_WIDGET_DRAWABLE (ruler)) gtk_widget_queue_draw (GTK_WIDGET (ruler)); diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index 732677570e..a5692df419 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -108,6 +108,7 @@ gtk_settings_init (GtkSettings *settings) i++; settings->property_values = g_new0 (GValue, i); i = 0; + g_object_freeze_notify (G_OBJECT (settings)); for (p = pspecs; *p; p++) { GParamSpec *pspec = *p; @@ -119,6 +120,7 @@ gtk_settings_init (GtkSettings *settings) g_object_notify (G_OBJECT (settings), pspec->name); i++; } + g_object_thaw_notify (G_OBJECT (settings)); g_free (pspecs); } diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index dc3230fc63..c9212c16c5 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -1471,6 +1471,7 @@ gtk_spin_button_configure (GtkSpinButton *spin_button, else adjustment = spin_button->adjustment; + g_object_freeze_notify (G_OBJECT (spin_button)); if (spin_button->digits != digits) { spin_button->digits = digits; @@ -1482,6 +1483,7 @@ gtk_spin_button_configure (GtkSpinButton *spin_button, spin_button->climb_rate = climb_rate; g_object_notify (G_OBJECT (spin_button), "climb_rate"); } + g_object_thaw_notify (G_OBJECT (spin_button)); gtk_adjustment_value_changed (adjustment); } diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 1c331b3b9a..7e5b33babd 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -625,7 +625,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) G_TYPE_BOOLEAN, 3, G_TYPE_OBJECT, - GDK_TYPE_EVENT, + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE, GTK_TYPE_TEXT_ITER); } @@ -756,6 +756,7 @@ set_font_description (GtkTextTag *text_tag, } else { + g_object_freeze_notify (G_OBJECT (text_tag)); if (text_tag->family_set) { text_tag->family_set = FALSE; @@ -786,6 +787,7 @@ set_font_description (GtkTextTag *text_tag, text_tag->size_set = FALSE; g_object_notify (G_OBJECT (text_tag), "size_set"); } + g_object_thaw_notify (G_OBJECT (text_tag)); } } diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index 21622867a5..03d2a8d821 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -169,7 +169,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class) GTK_TYPE_WIDGET, G_TYPE_STRING, G_TYPE_STRING, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); } static void diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 7e6c457d41..30dcb143ef 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -657,7 +657,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[EVENT_AFTER] = g_signal_new ("event-after", G_TYPE_FROM_CLASS (object_class), @@ -665,7 +665,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) 0, NULL, NULL, gtk_marshal_VOID__BOXED, - G_TYPE_NONE, 1, GDK_TYPE_EVENT); + G_TYPE_NONE, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[BUTTON_PRESS_EVENT] = g_signal_new ("button_press_event", G_TYPE_FROM_CLASS (object_class), @@ -674,7 +674,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[BUTTON_RELEASE_EVENT] = g_signal_new ("button_release_event", G_TYPE_FROM_CLASS(object_class), @@ -683,7 +683,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SCROLL_EVENT] = g_signal_new ("scroll_event", G_TYPE_FROM_CLASS(object_class), @@ -692,7 +692,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[MOTION_NOTIFY_EVENT] = g_signal_new ("motion_notify_event", G_TYPE_FROM_CLASS(object_class), @@ -701,7 +701,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[DELETE_EVENT] = g_signal_new ("delete_event", G_TYPE_FROM_CLASS(object_class), @@ -710,7 +710,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[DESTROY_EVENT] = g_signal_new ("destroy_event", G_TYPE_FROM_CLASS(object_class), @@ -719,7 +719,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[EXPOSE_EVENT] = g_signal_new ("expose_event", G_TYPE_FROM_CLASS(object_class), @@ -728,7 +728,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[KEY_PRESS_EVENT] = g_signal_new ("key_press_event", G_TYPE_FROM_CLASS(object_class), @@ -737,7 +737,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[KEY_RELEASE_EVENT] = g_signal_new ("key_release_event", G_TYPE_FROM_CLASS(object_class), @@ -746,7 +746,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[ENTER_NOTIFY_EVENT] = g_signal_new ("enter_notify_event", G_TYPE_FROM_CLASS(object_class), @@ -755,7 +755,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[LEAVE_NOTIFY_EVENT] = g_signal_new ("leave_notify_event", G_TYPE_FROM_CLASS(object_class), @@ -764,7 +764,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[CONFIGURE_EVENT] = g_signal_new ("configure_event", G_TYPE_FROM_CLASS(object_class), @@ -773,7 +773,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[FOCUS_IN_EVENT] = g_signal_new ("focus_in_event", G_TYPE_FROM_CLASS(object_class), @@ -782,7 +782,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[FOCUS_OUT_EVENT] = g_signal_new ("focus_out_event", G_TYPE_FROM_CLASS(object_class), @@ -791,7 +791,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[MAP_EVENT] = g_signal_new ("map_event", G_TYPE_FROM_CLASS(object_class), @@ -800,7 +800,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[UNMAP_EVENT] = g_signal_new ("unmap_event", G_TYPE_FROM_CLASS(object_class), @@ -809,7 +809,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[PROPERTY_NOTIFY_EVENT] = g_signal_new ("property_notify_event", G_TYPE_FROM_CLASS(object_class), @@ -818,7 +818,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_CLEAR_EVENT] = g_signal_new ("selection_clear_event", G_TYPE_FROM_CLASS(object_class), @@ -827,7 +827,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_REQUEST_EVENT] = g_signal_new ("selection_request_event", G_TYPE_FROM_CLASS(object_class), @@ -836,7 +836,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_NOTIFY_EVENT] = g_signal_new ("selection_notify_event", G_TYPE_FROM_CLASS(object_class), @@ -845,7 +845,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[SELECTION_RECEIVED] = g_signal_new ("selection_received", G_TYPE_FROM_CLASS (object_class), @@ -875,7 +875,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[PROXIMITY_OUT_EVENT] = g_signal_new ("proximity_out_event", G_TYPE_FROM_CLASS(object_class), @@ -884,7 +884,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[DRAG_LEAVE] = gtk_signal_new ("drag_leave", GTK_RUN_LAST, @@ -976,7 +976,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[CLIENT_EVENT] = g_signal_new ("client_event", G_TYPE_FROM_CLASS(object_class), @@ -985,7 +985,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[NO_EXPOSE_EVENT] = g_signal_new ("no_expose_event", G_TYPE_FROM_CLASS(object_class), @@ -994,7 +994,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[WINDOW_STATE_EVENT] = g_signal_new ("window_state_event", G_TYPE_FROM_CLASS(object_class), @@ -1003,7 +1003,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) _gtk_boolean_handled_accumulator, NULL, gtk_marshal_BOOLEAN__BOXED, G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); widget_signals[POPUP_MENU] = gtk_signal_new ("popup_menu", GTK_RUN_LAST | GTK_RUN_ACTION, -- 2.30.2